Header dependency fix.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/xen/arch/powerpc/Rules.mk b/xen/arch/powerpc/Rules.mk
index 49e0e5477ab5029512b2a12ca7ce2630d7c408a9..330f55460e7ca91d9a335911096a44b59e24115c 100644 (file)
--- a/xen/arch/powerpc/Rules.mk
+++ b/xen/arch/powerpc/Rules.mk
@@ -12,7 +12,6 @@ C_WARNINGS += -Wpacked
 CFLAGS += -m64 -ffreestanding -fno-builtin -fno-common
 CFLAGS += -iwithprefix include -Werror -pipe
 CFLAGS += -I$(BASEDIR)/include
-CFLAGS += -I$(BASEDIR)/include/asm-powerpc/mach-generic
 CFLAGS += -I$(BASEDIR)/include/asm-powerpc/mach-default
 CFLAGS += $(C_WARNINGS)
 CFLAGS += -msoft-float -O2
@@ -33,6 +32,8 @@ LDFLAGS += -m elf64ppc
                --redefine-sym _binary_$*_bin_size=$*_size \
                $< $@
 
+HDRS += $(wildcard $(BASEDIR)/include/asm-powerpc/mach-*/*.h)
+
 # Test for at least GCC v3.2.x.
 gcc-ver = $(shell $(CC) -dumpversion | sed -e 's/^\(.\)\.\(.\)\.\(.\)/\$(1)/')
 ifeq ($(call gcc-ver,1),1)

diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 9296afd9d9292f1ab7470960cd95b23440daadf5..cbc2f1dadc8bdd64e312de23da8f18d35c0cff7a 100644 (file)
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -57,6 +57,7 @@ endif
 HDRS += $(wildcard $(BASEDIR)/include/asm-x86/hvm/*.h)
 HDRS += $(wildcard $(BASEDIR)/include/asm-x86/hvm/svm/*.h)
 HDRS += $(wildcard $(BASEDIR)/include/asm-x86/hvm/vmx/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-x86/mach-*/*.h)
 
 # Require GCC v3.4+ (to avoid issues with alignment constraints in Xen headers)
 $(call cc-ver-check,CC,0x030400,"Xen requires at least gcc-3.4")